Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 13 Feb 2010 13:18:46 +0000 (08:18 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 13 Feb 2010 13:18:46 +0000 (08:18 -0500)
commit2e0f0d8b6c2b2f9bd04a6534c5154c57380c5121
tree38f51c872419ad42a3fed8a99d88fc0b5d897213
parent1ddc8c3f4aecdbc5f572c5441500c3fa1a468a44
parent9ec179b3dc441055a535245f0b8269dc26ce7130
Merge from mainline.